Merge master@5406228 into git_qt-dev-plus-aosp.

Change-Id: Ibaeaf918de950d67dcd5eb3a0633a85dbdccb460
BUG: 129345239