Merge master@5433138 into git_qt-dev-plus-aosp.
am: d39ca2f3b4

Change-Id: I44f4198259e07a50ff48f9df94e8f6514a835d2d