Snap for 7183507 from 3c52d591bece479e06f9ad4bbdd75c0a5fd4681b to sdk-release

Change-Id: Ib5476c3ade9ea95698a3a92cb4af1cfe8dcd0036