Snap for 9550355 from 47bfe9bc95e70661d78cee32e2d2b513c21aa942 to sdk-release

Change-Id: I7fd6d0447adfdca4087de03570365a496f73ef79