Snap for 13206398 from 7b23404f158a0b2e9637cd63031804851d862da7 to sdk-release Change-Id: I6bc5d61d75165400f1d4ea2ec0f4ba9855360322