Merge changes from topic "cherrypick_for_b_137937105" into qt-qpr1-dev
am: b24f30c685

Change-Id: I93d359b043788513a73e016186cc831f361e9763