Snap for 7800789 from 0d4ddeb31266076d40eb9fe248ffa5b97729dce9 to sdk-release

Change-Id: Id5e653353ecd33a9242b591cd71703c84184021e