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

Change-Id: I7d5e9c4b24efa80f47ebc135c9fbe0fd91dbbd2b