Merge cherrypicks of [9513175, 9513021, 9513295] into qt-qpr1-release

Change-Id: Ia3cadfd316a4d18880e8b2399a5b30ff1327c3d4