Merge "Only run Kati twice on a clean build due to clean_steps.mk"