Snap for 7183507 from e9f08cc97420b61cbbb563bbfb97d3e8522d7996 to sdk-release

Change-Id: I53a7f4f922c711db453e23e4f81e011ac11766e2