Merge "Update SDC to use master docker images"