Snap for 8952093 from a78ed47afc31121f8fed0c6bca38e823d855d06f to sdk-release

Change-Id: I7517ba1b4bb38ac83fb1ae1ffcadb82538814a0d