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

Change-Id: Iec6a43fb841e0c03696d82ec0265ac58a6e1a100