Merge "Add a build flag to stage I09a7667a57f545927dbe9ac24c1a6b405ff0006d"