Add back some changes for our AppOps.

Change-Id: I2a173e4db971ee4b1c4685c2caa13aa63a6ac539