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

Change-Id: Iff8af7633471703c205122d16572be0cf2410bb2