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

Change-Id: I71bd3332f197aaae737dd8a77ff30aa192dcb65d