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

Change-Id: Ia9cc4fc55374a65112db71c8845db5fe616c0fb0