Merge master@5428150 into git_qt-dev-plus-aosp.
am: 64c1458e2d

Change-Id: Id3553998255b94ad370b648374c1499501a5cb8a