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

Change-Id: I86c75c4394b3ba0ab0153a6eb54b33671f4b38d3