Snap for 7843118 from cb47065ff1af52ada0e2d6e8eeab9f67903622ac to sdk-release

Change-Id: I1eacd82228252d69f279179c870cbc60ddef6b1a