Merge commit '9c6a104cfeb943e7bf8124ca21cfa4eaefb11160' of sso://googleplex-android/platform/system/core into HEAD
Change-Id: Iffa029a52bf3a38cc06eaeda8ba2575545d0b0e2
Ignore-AOSP-First: Internal projects only