[automerger skipped] Use a constant-time MAX function am: f06684acab am: 79185543e0 -s ours am: 35f8d9f8e9 -s ours

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

Change-Id: I4b0aa9ef10bd1479d83a7eeab4aa55ed0c7afaac