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

Test: none
Bug: merge
Change-Id: I04ab2b4c7c3acb183bcee70f792ff331868c51ca