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

Change-Id: Icb589c27b56a9c4f61d362f9ddb4d5479dce8b9f