Snap for 6877830 from cb47e1cb1dde99a0a37c6c12ce9fc0ce933aec47 to sdk-release

Change-Id: Ifbe733f37b4737edb0dfab73a769063bb412e609