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

Change-Id: Ic490fac54ccb2895fff371bba05192e6ad21502c