Merge cherrypicks of [9558225] into qt-qpr1-release

Change-Id: Iff354b34a8b8eb29d848598ab5a6150931546105