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

Change-Id: Ic590474be6f48550f8e897868e37eeb49130e200