Merge "Fix AppOps collection bug." into rvc-dev am: fdd209e9 am: 879c060c am: 7ebcad1e am: e201fe0f Change-Id: I789357d835f9d1bf292890f7bcf7f2f236963bde