Merge cherrypicks of [9735310, 9736237, 9736061, 9736062, 9736238, 9736299, 9736300, 9735211, 9735311] into qt-qpr1-c-release

Change-Id: I51f1ff56bd5029eac73d786014e87fe15da69006