Snap for 8144225 from 01f1d345e27216709fee58a4a8e189269a4598d8 to sdk-release

Change-Id: I5055d498247552fbbc1ad3bb9ab6d4b465791931