Snap for 7183507 from 1c88bb817572a874453e5c4f2f5082107e0130c2 to sdk-release

Change-Id: I3974cfa35e6e92ed4ce8e3125787e43a0cfa799e