Snap for 8167433 from bb4bf33b347599147a79f44373ec6258eb150da7 to sdk-release

Change-Id: Ie7ac12b15715025d624f1def8fce4d0c21536cbb