Merge master@5428150 into git_qt-dev-plus-aosp.
am: 24e04e1e4a

Change-Id: Icaf0d6a5ab6135778c868965dbb797489ffafeca