Merge "Add keystore to AID_READPROC"