Merge "Avoid manifest marked modified during broken build"