Merge "Fix AppOps API review bugs."