am: 39f8659d24 * commit '39f8659d2423b99a9136fe706fdf7b1b5a1a9c97': Improve mergeability of metrics_constants.proto