Merge "Remove obsolete keystore path"