Snap for 7800789 from 0584a973d2ce98f018d975a07aa982c26db6f928 to sdk-release

Change-Id: I7537114a1963d85ab13cfbc271b534e86a7a8436