Merge cherrypicks of [9802047, 9802131, 9802048, 9802634] into qt-qpr1-release

Change-Id: I5ad8695c17d140463283ea4f2102f3fa169e8660