Snap for 5590969 from a4b7498ee040c4a5f394fb899511ae94e62bdcf1 to sdk-release

Change-Id: I7b9ce0df10ec29d26c01f37f08c80d15e56ee787