Snap for 7183507 from eaca4d18d27d7fa54182f1cd91849bddca42db92 to sdk-release

Change-Id: I30e2b2da9ed5fa240f487354fc36c6686690a778