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

Bug: none (merge)
Test: treehugger
Change-Id: I0ed9286cac75c2c106e3c93e96a940af9e7b3504