Merge cherrypicks of [9551688, 9551401] into qt-qpr1-b-release

Change-Id: I8dbd80e24166d45512b42c41ad5e924ca64be8ac