Merge cherrypicks of [9310510, 9310459, 9310430, 9310576] into qt-c2f2-release

Change-Id: I44eb1a15550d7e77f7527fe0c78c7efcb1abcd04