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

Change-Id: If7bf6ad62a4399b437b51ea7afc22fff0c93cbd3