Snap for 6877830 from 0bd5ab11c971779c76251670f37482fd41a93b54 to sdk-release

Change-Id: I4c8da8c59b794a2d7d8225c50d48d58b90ecd734