Snap for 5925869 from f0e7ce67121940312eaffeda9c4add56d63bf4e1 to sdk-release

Change-Id: I21a446240f9682ded8fd3978df0339dfd05ac28d