Merge master@5406228 into git_qt-dev-plus-aosp.
am: 5e4d1446c2

Change-Id: I0d4fb382b9a897fc8c0bf5c42524926c1aa5420a