Merge "Fix telephony service crashing on CryptKeeper mode" into nyc-mr1-dev