Merge "Adjust to changed internal API"