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: 936b3501
am: ac74c77b
Change-Id: I8d1849f5d41cd866c4ec2c48bb2b8516b7d79c02