Merge changes from topic "bp-135269143-q" into qt-dev
am: 660c3b11c7

Change-Id: Ia33da8f677ecaaa07e3d9adc1a00f0289798d011