Merge cherrypicks of [9950700, 9950296, 9950297] into qt-qpr1-d-release

Change-Id: I7f224a16440761b4d0071984141869ec7ae68816