Snap for 6198741 from 4ed14f6a3da20e8c7022d91239d85dee4c568c5c to sdk-release

Change-Id: I400a034417eddd3efc1eda74909986590216a460