Merge cherrypicks of [9950314, 9950315] into qt-qpr1-release

Change-Id: I3411185536f0057b55127c295d141ea7212f50af