Snap for 9679998 from 4d9fcf13d9f47750ed797ad578ef68cc82bbb41c to sdk-release

Change-Id: Iaaed6d93e200470196a840076f1385823cb6c710