Merge "Minor clean-up to Transformers.java"