Merge "Fix bugs in AppOp restrictions" into sc-dev