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

Change-Id: Idcbc0d5e9af44b43ed76e4bbf1c202f7abef29bd