Snap for 12446955 from f32dcbf81a5721a6dacb5a1afd0474e7e038d769 to sdk-release

Change-Id: Iee83df010e445f6f150c0757635c1a46ddbfc161