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

Change-Id: If44cc026bcc6587a3c55ef00f30f08b08dd0b643