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

Change-Id: I135c694dcb721bdc09a799cc80ae4d4dd8ba098d