Merge changes from topic "gav1_to_qpr1" into qt-qpr1-dev
am: 51a39039d5

Change-Id: Id2b02c2fc31ae3565fb92688e2282b158192ffe7