Snap for 7229773 from a71335aa89f9960277b53e4544c33496eab9d20b to sdk-release

Change-Id: I5f00f8428a3872ed87daa5666de405986834ffc4