Snap for 5925869 from f5a5dfab14f23be6800edf79729edf5d7da4ad72 to sdk-release

Change-Id: I3a5a7fb30f40d504405fb9aaf75a7dbe93bb0bfd