Merge commit 'e4df6724d440458f7c3ed6f4e709b42a492a52a8' of sso://googleplex-android/platform/system/extras into HEAD
Change-Id: Icdc9cfc1a3dbc2a0dd6d1a23d571a0e7ce1f7161