Merge "Pipe through attributeId to notification app-op" into rvc-dev