Merge "Remove the data type from the OperationType enum." into oc-mr1-dev
am: 5a9c0c3186

Change-Id: Ic3f9d555efe1cf99a4fc4d338c78227837bed57e