Merge "Minimal reformat to match internal master."