Merge branch 'stable-3.3'

* stable-3.3:
  Fixup! Merge branch 'stable-3.2' into stable-3.3
  enable google Javascript formatter

Change-Id: If72fb4e6c0e993675363d5832af82eff68b1cbf6