Merge branch 'stable-3.3' into stable-3.4

* stable-3.3:
  Fix 'illegal format conversion' compilation error

Change-Id: I50d8ff92d31caf039391847a076ca71adee3083a
tree: 4032cc927a6408672ae85c0cb3115f5f12a33430
  1. src/
  2. BUILD
  3. Jenkinsfile
  4. LICENSE