Snap for 9550355 from 09e7a52d836711f31b61be3f5a20e9f8665affbc to sdk-release

Change-Id: I59a333f9a9974fad5e3443053c91f5243f9888d1