Merge "Guarding against RecoverableSecurityException in N." into arc-apps