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

Change-Id: I11b401e3b21925f0491e5660087330a6a54acbfd
tree: 01141124dd712c30ad82ece7882e8acb526eb419
  1. service/
  2. PREUPLOAD.cfg