Snap for 5925869 from e17ed85e2a3b4691efd6975a02f8e56277cc93af to sdk-release

Change-Id: I7b04dbe5731204011b7d126a34d24a58da06ce3c