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

Change-Id: I6684a6b8c8082d80d6a52c6e730e259d4a220965