Snap for 8782634 from fa234fbf6bab2dc85281f27b6b428810018cbdd0 to sdk-release

Change-Id: Ia2834c93335b3fcdf37b42f6f4b9eff962ddeebc