Snap for 8782634 from 3cb1afacd1f4670a984dac7ff3fe420f0787fe5c to sdk-release

Change-Id: I3ee9bda2115c72694782401b076b7f3e8d8b0369