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

Change-Id: I6556ed4a19f2ff18ae4c0b8de93c37209a4e1e60