Merge branch 'stable-3.2' into stable-3.3

* stable-3.2:
  Update Okta instructions

Change-Id: I7ffb13546571eeb2f387405de49009c2f524c8ff