Merge \\"Fix telephony service crashing on CryptKeeper mode\\" into nyc-mr1-dev am: 54cda7fcb5
am: 0566825a9a

Change-Id: I552229de8cbea3a391f70a81fc3371a8c1b18474