Snap for 8782634 from dabcf159e357de45cf66ca9c982e591f6180a8fa to sdk-release

Change-Id: I926ca265a67dfef57857745c78f1987c476bf568