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

Change-Id: I38171128bb5f3b12ec629884e5602d96883f3d36