Merge branch 'stable-3.3'

* stable-3.3:
  fixup!: Merge branch 'stable-3.2' into stable-3.3

Change-Id: Ifa328c05fd66baf4f7166ce6786b0be25cd98fde