Snap for 6198741 from 134394962fc46d68fc8f295aed23c932a59c67a4 to sdk-release

Change-Id: Idae482e909d5166b68bd61111b0f10cec984a3e9