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

Change-Id: I407f4f7fa1c5deeb657cc1da8529e9ebd47ffa72