Snap for 7236715 from a9ec69433d71472316cf88d9c620b4b227369915 to sdk-release

Change-Id: I04bd606d14c6427817bac3f752b6f8ef9ab1f89d