Merge cherrypicks of [9364278] into qt-qpr1-release

Change-Id: I192926ffc6e81ad17957db3f19b03ad1ca27964e