Merge "Merge changes I256e6ed1,I97d41ed0,I6b4177e4 into qt-dev am: 111a49ba97 am: 83c19ade87" into qt-r1-dev-plus-aosp
am: 12bb47fd1c

Change-Id: If7ddd198fe40227853057d03cc7ac8536b673c00