Snap for 6198741 from f2a15e8742cf33e37e6c96f4731c298c6749bb68 to sdk-release

Change-Id: Ia9fe4d5ef2d3d90d833cd639ec739cd2ee5f1311