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

Change-Id: I19c59765d910740cbdc2ab4f4a18585b3de47449