Snap for 6290619 from e61d19e1b6695d83d77516061934bfbbe1bfbfd4 to sdk-release

Change-Id: I8cf4f22dfd3949c44393a66bff8c9c5be78d2385