Merge cherrypicks of [9802108, 9802110, 9801869] into qt-qpr1-c-release

Change-Id: Ia71727857708831fa8a583806c78f16294a061ca