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

Change-Id: I9d128e893ebb8372494380070eaa0a6facef0477