Snap for 6198741 from 4da5ca807ec753ef0dba496f8db65738084c42bb to sdk-release

Change-Id: Id8a92dd9733f2d7738a18576450bb718937f9f96