Snap for 13198286 from 6bee792e12fd8657edab29e53737da812c976497 to sdk-release

Change-Id: Icc87c40183a783b54649acff8f328f7b1308e8ad