Snap for 5925869 from b51a87e3132ac8ab291f12e0b510b3491398afcf to sdk-release

Change-Id: Id30caa22f019265b14b299c85b430935f8fe2cb0