Merge changes from topic "am-8180b640df344549896df06fe011cc0d" into qt-dev-plus-aosp
am: 707abd5f40

Change-Id: Ice53c2e1e72ce2140971006129d047bee778df70