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

Change-Id: I4f2f48b62663e6c1d2f5b47bf9154134a30dbe05