App Ops: Some optimizations

Change-Id: I2ed34b1ca551ad510df4b6d48835d509552501b8