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

Change-Id: Ia5e8a0f80e90046ec5f23d1872f7d5f3c3ef1831