Merge commit 'd950b7b5f303a534313070cfbee66f6ab0d05c16' of persistent-https://googleplex-android.git.corp.google.com/platform/system/core into OCSYNC

Change-Id: I71eaacaabf99c31c0904c40c2eafe57c366b0432