Fix indentation issue with last cherry-pick.