[automerger skipped] fix soft reboot caused by KeyStore exception am: b4486b2a1b -s ours
am skip reason: Change-Id I8a3b810ba95898a96d81fe57979db4787e1a46c4 with SHA-1 0b3eca3c05 is in history

Change-Id: Ia71ba06d0993473e9d90c7b19f3842e030fa5d09