Snap for 8023979 from dd6d9f9f6c9d095bd159d4f0d8b36a6b7e6057a8 to sdk-release

Change-Id: I3a7da25dead6fcc2acc64149233b9d480fa34435