Merge cherrypicks of [9949397, 9950778, 9950295] into qt-qpr1-b-release

Change-Id: I20d5e3732254c935356026b30de46cb7ffb8018b