Merge "Make timestamps used in AppOpsService consistent."