Merge "Work on issue #18572506: AppOps in-memory state is invalid after..." into lmp-mr1-dev