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

Change-Id: I3f2335624a28ac0a0980380995cb686801aee80f