Merge cherrypicks of [9732741, 9732578] into qt-qpr1-release

Change-Id: Ia3ed40c06076178caa755f632aa53cf436583e47