Snap for 12503729 from 80da7c66def28821bfacbacaabb398759911c597 to sdk-release

Change-Id: Id6cfe4fb44e16cbd941869262806dd4503303bd3