Merge master@5406228 into git_qt-dev-plus-aosp.
am: 4f2f2ab4ec

Change-Id: I318bb7d6ea644b2de440e6fe7688b5bd89d8ac95