Snap for 7800789 from 418b791d679beb2078b579a3b6936cf330c41799 to sdk-release Change-Id: Iae72538f6fda7789c5f8fff20b190f408c9cbbba