Merge "Remove beginOp and IOperation" am: e25a14c34a

Change-Id: I206470dd00805f54a66a1d0195d6339b5ead3a40