Merge "Fix AppOps collection bug." into rvc-dev am: fdd209e94b

Change-Id: Ia5f4b4fcd617f6b50833ddb8b3a34ab3aaa1c3a3