Merge master@5428150 into git_qt-dev-plus-aosp.
am: 11348eabb7

Change-Id: I2b289b70146631c33796167f90f449ccc6c8b6d5