Snap for 4794708 from 4dec89d47fde128280b9507409a0e3da0b7cf990 to sdk-release

Change-Id: I9b45aefb84a89b3c71304d0e22af1bdc18268255