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

Change-Id: Ia24e578f08ecc0227af6a02c5d935147830c4aa2