Merge "Fix AppOps collection bug." into rvc-dev am: fdd209e9 am: ef9786ba am: e135ba61 am: c1ae84cd Change-Id: I5356d854f2dda7d2cf5a3deb7b57a7b1697eb560