Merge master@5406228 into git_qt-dev-plus-aosp.
am: 24c1121304

Change-Id: Ia8dd89967b8c1071281555af42e7f5961e86a9e9