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

Change-Id: I0a471e6aecf3f3c8e6942b78ce08b0fac35a5c1d