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

Change-Id: I7b5a18d66072be477b81a85757fd416ad9f0c369