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

Change-Id: I6b93281378a7463bd5d884cab31a012b60c1cf71