Snap for 8023979 from bcd4d7c7cf329e1c4e774a37fecd8a29ba68f201 to sdk-release

Change-Id: Ifca9e3b68db8a16c52d5beb36a8421f78ea3a6de