Merge "Strongbox may not support 1024 bit key size for RSA." into udc-qpr-dev