Snap for 7110675 from 2973429028a1809a32de2915a1dcab3ee5bdf65e to sdk-release

Change-Id: Ia2f76da44d58a0ea2cfd27ad8a6a1627e12d1e5f