Snap for 8952093 from 3ccf4a764ea48a952dfd3dfa6b91dd79b5bc995f to sdk-release

Change-Id: I7d9df5089dc7fd9680331156a31b3f31330df8c5