michaelwr@google.com

per-file ColorDisplayService.java=christyfranks@google.com