Merge changes from topic "am-851f19c8d7d34bb48accd48868aae501-qt-dev" into qt-dev
am: 0edeaa365e

Change-Id: I8cd6013a4312d945936a38026285b2e33f6c7c49