Merge "Skip (let it pass) rather than fail CompilationTest on 'user' builds." into nyc-dev