Snap for 6290619 from d6ed2d7c6d55e3ad3cba372233160b812c250e2e to sdk-release

Change-Id: I144b84652e2fbab63d66bc31d6c336ed24e9032b