Snap for 8952093 from fa5d0bc3585165a6384954ff6e09266a525d67ed to sdk-release

Change-Id: I884736cf9fc9006cfcf5c791fa7549c64a18c0c0