Merge changes from topic "am-04c3ade2997f463f99e7d6e99506ddc2" into qt-r1-dev-plus-aosp
am: 8b584bda41

Change-Id: I5457d97385138a8a25ade8fb80988602e587c6b1