Merge "Add missing parameters to notifyAcquired and notifyError"