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

Change-Id: I3a198d4d4f80cc625820364d66072244f9ac1be1