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

Change-Id: Ie2c8fd83c8b1683e764417bbab57f11a4c8a59e9