Snap for 5611628 from 7375122722637034cee9d6e9d4e5b4fc4cebf759 to sdk-release

Change-Id: I56319b6e6ea05736b6f8f2885d7e61df0b41b6e1