Snap for 8782634 from 6274f843cd8d636e4062a8e42376d805d41ba670 to sdk-release

Change-Id: I97198348c0f5b00aa6f4520897dd3bd12b7d52a0