Snap for 5925869 from 341c85ed68d932afcdd4481d361d9c1e65b453e2 to sdk-release

Change-Id: I6e128c8e498a62b4876ce65f400f963b96a4de4b