Merge "Fix AppOps collection bug." into rvc-dev am: fdd209e9 am: ef9786ba am: 9b18463b am: f6d4cd2e Change-Id: Ic2dfbdcb27e6853b2c508ab9836d75779dcd66d6