Merge master@5406228 into git_qt-dev-plus-aosp.
am: 31cb02f261

Change-Id: Iaa1afba8ef5c5ed1946ff3b236447c42d20ac1b8