Merge "Add the error code "OPERATION_NOT_ALLOWED" and log the error." am: fe9cb04ec1
am: fe2279d2cc

Change-Id: I61590a5e4c31367efe76167396a3dc23de111d17