Snap for 11566117 from ac5cbb07d87cc342fcf07715857a812305d69888 to sdk-release

Change-Id: I3d21cfffad4db3d24f9b4440864d4aab245d0656