Snap for 6290619 from f6d037e29761e8f13ae0ab092ceb6d2c249f5a29 to sdk-release

Change-Id: I155b953177295c5bb54a8f7f8fb2235b81c5a306