Merge master@5406228 into git_qt-dev-plus-aosp.
am: 6f9ed978a2

Change-Id: I0b26ba6c8f898e7f668b0b27fb333cca0a8c7591