[automerger skipped] fix soft reboot caused by KeyStore exception am: 975bc2676f am: f6658e1bb6 -s ours
am skip reason: Change-Id I8a3b810ba95898a96d81fe57979db4787e1a46c4 with SHA-1 98337b741c is in history

Change-Id: I9e26229a65f7faa533212c24386c22e53b9da576
tree: 2833d91d0ebd740816559267900c1c342e0b25cd
  1. apex/
  2. service/
  3. PREUPLOAD.cfg