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

Change-Id: Id9c24bc76415f353f389f0e50e1bdfed5a86adcd