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

Change-Id: I25e1e6d3528557bc4b8b6d87262be99de0e32575