Merge "Annotate KeyStore service as never null"