Snap for 8023979 from 737b0c7201e8860700392039930668926519dfb1 to sdk-release

Change-Id: I92421211b176fb7ca21859fbd8853c13e4002754