Merge master@5428150 into git_qt-dev-plus-aosp.
am: 734e0d0e02

Change-Id: Icf432f01762c64e800095377bf09cb8ca7c9216b