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

Change-Id: I7d09055b410cd44c12690da7125ed20f8e90079b