Merge master@5428150 into git_qt-dev-plus-aosp.
am: 03851e58fe

Change-Id: I6248a86709a5c61ca482ef1cbea40e5ca6b29f5e