Merge cherrypicks of [9256783, 9255501, 9255502, 9256667, 9256422, 9256668] into qt-c2f2-release

Change-Id: I5847668b6d045b44d527dace05a8b6144cab5b3a