Merge master@5428150 into git_qt-dev-plus-aosp.
am: 442cc03298

Change-Id: Icfcdef66f2f1d74becdb358d3cc827de339a3cda