Snap for 6290619 from ccb441309e11b0abe0b5b7c166baddf265705532 to sdk-release

Change-Id: I94a6f633dd002c53521c0acc7af6e6c2c0a35337