[automerger skipped] Use a constant-time MAX function am: f06684acab am: 12ee974557 am: 6b94cd60e2 am: 22cddca2df -s ours

am skip reason: Change-Id Ife1012c14d697141e6ee0c583dc32eaacdb72b73 with SHA-1 f06684acab is in history

Change-Id: I34fd2399559a25aa4b8bc20a864875a12829738f