Merge "Add the error code "OPERATION_NOT_ALLOWED" and log the error." into...
Merge "Add the error code "OPERATION_NOT_ALLOWED" and log the error." into oc-dr1-dev am: 3a57cca5 am: 16ad551f
am: 1dea5e2f
Change-Id: I4c9ca41e533d09e7121d3d7f1897e45183968e1c