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

Change-Id: If19671ba662c58bbf8ed5168d9d775004df5d310