Merge master@5428150 into git_qt-dev-plus-aosp.
am: 075bbf6d64

Change-Id: I95b26c922e8b19bec14d0be9c6a93291b6b0d069