Snap for 5475808 from 3c10a4be1a3cbb4366f0457a219a293d030af381 to sdk-release

Change-Id: I0e775a46d2e4cb64e2694256f5b15065be318e77