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

Change-Id: I0205a31002f54216df63f2e51f254540ab2f274f