Snap for 8952093 from 03b91ecdc1db1e077bec73ea3a958469a9ffc60a to sdk-release

Change-Id: I814bfa29c23397965aad3c46c616d516afd4ed11