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

Change-Id: Idd2a51fa15116fd56b26a59c1a62f10e5847333b