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

Change-Id: I29cd8210f7b384874050ad149c5f7907e72ef0f4