Merge "fuelgauge OWNERS eof newline merge conflict"