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

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