Merge cherrypicks of [9542567, 9542568] into qt-qpr1-b-release

Change-Id: I7368736ddf15b0b1618ffc536dda3990273f3ee3