Merge changes from topic "am-a206f967153f49f0b7bd956a1d464b13" into qt-r1-dev-plus-aosp
am: 655a9ba232

Change-Id: I642dacab5b9b1e3a8f06e6cbf1391e5b38ac8e6d