Snap for 13198286 from b30a9e724617734b637163330354f76c5fafda2f to sdk-release Change-Id: Iae4e35566c40cc432e680f7567971b2a09e7e07d