Merge "Don't attempt to override compat changes on user builds." into tm-dev