Snap for 6290619 from 015a5444dae8fed21ebbc23878c5c460ab10ee45 to sdk-release

Change-Id: I071d560a928eeea4a68bdaa91f0268a61e555117