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