Merge commit 'cae6aec3881db4ef5925bcd14d8d4c26912377af' of sso://googleplex-android/platform/system/core into HEAD

Change-Id: Ic0bf2c988ae1dd1d6e86753225f498b35371e888