Merge "FP permission checks should not crash system process" into oc-mr1-dev
am: 5f2ba81c06

Change-Id: Iaa0c94a9325ef944ddb6b62c2e80e39ef3bbb21a