Snap for 6877830 from d1299a41b4bdd9bdfd7d339fedde7fb433569f5e to sdk-release

Change-Id: I72e49bb417472edfa0347ec63cbf82590d60a636