Snap for 8782634 from 69202d597a6a5ccfffff7224f6a4394773839272 to sdk-release

Change-Id: I28719420aaa56dca6ba745f7bc584ac8e45d0dcd