Snap for 8023979 from d895f099660f61e81cc1b881a2edff3fbaef6959 to sdk-release

Change-Id: If1a446aedc463dedafe61999c9dab6676cf9614a