Merge "Add the error code "OPERATION_NOT_ALLOWED" and log the error." into oc-dr1-dev
am: 3a57cca59c

Change-Id: Ic05db3d04b5840ab47c14c33748dac7d4659b540