Merge cherrypicks of [9434351, 9434801, 9434688, 9434802, 9434034, 9434035, 9434608, 9434036] into qt-c2f2-release

Change-Id: I046b7217377a10ff3add0fd4039837c42b54ae18