Deal correctly with short strings am: 1921acbf2c am: 49fefde164 am: 444e06c469 am: 0f37e416a4 am: 04fdb2ce41 am: 05e029710c am: 8e0899faab am: 15a72380b1
am: a9c9a971cf

Change-Id: Ic94581b343b7db7db19fc3102ad34acbcc83260e
tree: ae3527f3dc5e84b4e52ddc68329bd1f3e137dfd8
  1. service/
  2. tests/