Snap for 13235685 from 8ae4cfb5a06911391987b1a7c06d1f5719b4ce05 to sdk-release

Change-Id: I7a2cb26b1ea371c071c2c07221e46c01ad9a83c7