Snap for 12503729 from 1a0eb8cb44153249e00c48360ae69ab88115e206 to sdk-release

Change-Id: I9690f91fc90e45bfc3b103d9e7450ca865f7b099