Merge changes from topic "am-832d01d3cd424691910400d0c94d526d" into qt-qpr1-dev am: 6442668c74 am: e8d49ec0da

Change-Id: I55ce927f1f320c11bcd1bcc4853c95f7bf10f7bc