Snap for 8782634 from c75ea9b224f42e4b0b46b2a48b3effa2965390f9 to sdk-release

Change-Id: I731813e8dafac6c25b09058aa2ede3e696b07573