Merge "Switch to use stable data_utils"