Snap for 5925869 from 8551f46562192f9d81b7fb267497881168c49ed7 to sdk-release

Change-Id: Iaedf8882aa6b4b5e8a580d5888682c83a47fd36a