Snap for 6877830 from 72f3d586e1b079dcc8dd1ec56db629a976e4f4d9 to sdk-release

Change-Id: I58e9beb6eefd1a5acfbaadeea20d90f9887ab39f