Snap for 6198741 from 54e964b29ce87555c08383732823c13e5c4938dd to sdk-release

Change-Id: I3d05330d9c19a150419a872f2dd2e175ee18602d