Merge cherrypicks of [9638173, 9638613, 9638413, 9638414, 9638415, 9638614] into qt-qpr1-release

Change-Id: Iae77574c5c04d7c1f839a05ebe969c76270fdec3