Merge "Remove beginOp and IOperation" am: e25a14c34a am: aee7cc9b9c

Change-Id: I09bfa6950b32cdc54a0dd453a227086f048e8ea3