[automerger skipped] Modify operation enum. am: 1cc4ee8516 am: fc11d92cc4
am: 67f1b6c3ad -s ours
am skip reason: change_id Id6b1021c8707734499feddddf0aac24a3fff90f8 with SHA1 1f59bc3b24 is in history

Change-Id: I80d9a546718472084464c81531e63067ddd76fcf