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

Change-Id: I7787096fe044b201737a0f83af014687089c0cf1