Fix issues with AppOps commits

Change-Id: Idb4e3501ff9f58e491b06e74152342aa9594afbf