Snap for 8782634 from 13e068688da100b0f1d5ec08a375b2f062d92f39 to sdk-release

Change-Id: I35da9645b525933455ff419e69005d3e19b2a3a5