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

Change-Id: I7003321f7d5a66ec73d0e7f7765be3135a06536e