[automerger skipped] Merge "Remove IOperation and beginOp." am: 08ea5185 am:...
[automerger skipped] Merge "Remove IOperation and beginOp." am: 08ea5185 am: 2536314f -s ours am: 4bf34b9a -s ours
am skip reason: Change-Id I017d17079380cc3bacc6f05b2486e1b6e6c3f675 with SHA-1 e0affee8 is in history
Change-Id: Ie600f32c0b370e65996722bb96fef57c4ebc590b