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

Change-Id: Iaaa5aa9022cf50c5e7ee774a389cfed4991659b3