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

Change-Id: I582ec30e275c4d390d6ba8a8d97c913dcdb790fe