Merge "Fix AppOps collection bug." into rvc-dev am: fdd209e94b am: 879c060ccf am: 7ebcad1e5a am: e201fe0f7e
Change-Id: I789357d835f9d1bf292890f7bcf7f2f236963bde
This commit is contained in: