Merge cherrypicks of [9558384, 9558404] into qt-qpr1-b-release

Change-Id: Ia6f948a6987f68c27f9c2721f82f08a1920b3cf0