Merge "Minimal reformat to match internal master." am: 0d75603ea7 am: 5df94f6c14
am: 98202d9c6a

Change-Id: I990a0933fe9d50a98919452f7f0513d6f036a637