Merge changes from topic "am-6d3c333a1a1a4ced8a6f0af2d10145ec" into qt-dev-plus-aosp
am: 0ca0bbb674

Change-Id: I68812de872dea3b48d44d09a08e2c2e3eafbc415