Snap for 6877830 from f3ebf71e14186be9b881bc1d111ebab3b0b93f06 to sdk-release

Change-Id: Ie1def6cceb23496667c016687f00b5fffb4a06b5