Merge master@5428150 into git_qt-dev-plus-aosp.
am: 2642d60e73

Change-Id: I8aabf04d79dbcb95c401d52ff34be650cd0cf318