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

Change-Id: I33cc16e2a9ecd91e97b0824834760f88b13cac2e