Merge master@5428150 into git_qt-dev-plus-aosp.
am: 379f31cb69

Change-Id: I49926af9fdf33ac355ea41de5dfdc6b13277383d