Merge master@5433138 into git_qt-dev-plus-aosp.
am: 195a1ee1d5

Change-Id: I0d0c0ee23d117cfba1329ca139ea7d71f7a55961