Merge "FP permission checks should not crash system process" into oc-mr1-dev