Merge "Fix EmergencyCryptKeeperText initialization" into oc-dev
am: 1afa1646a2

Change-Id: I2cf920ba553587c4da04a1f1973a15d48c89ed80