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

Change-Id: If1f7862c71755f10eca68bfbcedcda431e39c0ff
tree: 9246f4285402c695060d518d15bc9e98060490f4
  1. service/
  2. tests/