Snap for 8782634 from f16c0c2c42006f03341601188e7319bbe25dd426 to sdk-release

Change-Id: I7ff9e34498c3bf6ceb9b951712a9dece8e880d0a