Snap for 6198741 from 0a934061cfaa974ed32e33a5821923267b7c338a to sdk-release

Change-Id: I03cd1ffbb6f64d0e88b036dd8a436ede900a1b5d