Merge cherrypicks of [9542614, 9542552, 9542615, 9542478] into qt-qpr1-release

Change-Id: I59102d69cb3946775f950a16f0ae835c3b585e73