Snap for 6198741 from ac0a9a68b20d28ef924452f30e4946d0107a8f06 to sdk-release

Change-Id: I066a2cc8c7eed4008aef088e51f48bcec213bbc0