Snap for 6660490 from a73922dd3563716cb58944e0585b33dbaf26ff08 to sdk-release

Change-Id: I03460d9b4744905cf45268d04c9928d6502aac70