Merge branch 'stable-3.2' into stable-3.3

* stable-3.2:
  Fix the junit test tag

Change-Id: I5935a14ccf61289d6c86371f894a168546a32364
tree: 0a4b19aa9b604dbfce81d6855891075b4d53ef3a
  1. .gitignore
  2. .settings/
  3. BUILD
  4. LICENSE
  5. src/