Snap for 7187421 from 270846b61c05c6a65f158af06aeb19f09cdbc9b8 to sdk-release

Change-Id: I3ac71956a8aff9461184e965966887cad4a7724d