Snap for 13198286 from eda387a01ffc563c29997d3021330e0d5586194c to sdk-release Change-Id: I96a586b9c5c9d2d18a2420eefa9ac766c5827476