Merge changes from topic "am-9a435ce648dc47d49fc32dc2680fa5b7" into qt-r1-dev-plus-aosp
am: 94cc108048

Change-Id: I46aebe74e24d39b7fce0c7eb835e282d59f2c169