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

Change-Id: I8f228721dea3568b312d5a0ec66a3f05a25fcde9