Snap for 7236715 from 9b749f077856b370f851083327b0f39c1d278548 to sdk-release

Change-Id: Ic3345e0d69207eb534297f5022b5b003e6c6e6ca