Snap for 7183507 from e55c9aa7ffa8e5d1ec7b77f498257081853a56ba to sdk-release

Change-Id: Iee1b3245fbcd00adcfdec8193782b765e1898350