Check key store result with isOk() instead of casted value am: d166a88fb9
am: 1de732d2f4

Change-Id: Ic023fb2d39eac13df05ab79fba2926cc4137c972