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

Change-Id: I1b0dc766f97838585cab7b201397e2a7b54755fa