Merge master@5406228 into git_qt-dev-plus-aosp.
am: 5f3d0b9afb

Change-Id: I1efda5f9920144ff4146defd16f8499e414231d5