Merge branch 'stable-3.1'

* stable-3.1:
  Make SecureCredentialsFactory public

Change-Id: I23ee1cc85100066704ba2157286654da38b0c3c6