Merge cherrypicks of [9950316, 9950317, 9949666] into qt-qpr1-c-release

Change-Id: I047a42f1de3ee9649aeef18bcc39cf0a206e11e4