Snap for 13198286 from e63a2a35d22f5d14e2a1d08ca2cd5d851224a02c to sdk-release Change-Id: I6ab756131c5d56f5e2c99fc966f903e8a4276605