Merge "Merge commit 'refs/changes/63/7273563/1' of sso://googleplex-android/platform/frameworks/base into merge" into qt-dev-plus-aosp