Snap for 6198741 from 0e521ae9aa2c8b1b3d30870ec9662affef4b61a7 to sdk-release

Change-Id: I7aa2555d6ab45b8b9b3f5f879f9756c4b2e88524