Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Make SecureCredentialsFactory public

Change-Id: I4dfd9e37da5e67ee7efb4a2657da014e9d35bbc0