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

Change-Id: I0c84868118e8c01d49c7464bdda4b72c39121dff