Snap for 7183507 from 7fad978edc5dded0129bd0fae40636e47abd92e7 to sdk-release

Change-Id: I8c280df62590f04d48f238a3c155ad84d2692d01