Snap for 7110675 from eb238164a0443a868191cb9baddcf49ce9c16fb7 to sdk-release

Change-Id: Ib3a8556f1ee2ae57751f36eef2bd2d5c7fb5246f