am d383ac15: am a0151cbf: Merge "Unit tests for formatting code, fix %%."

# Via Android Git Automerger (1) and others
* commit 'd383ac1570b553d68ed399c74b73bad1498d78f6':
  Unit tests for formatting code, fix %%.