Deal correctly with short strings am: 1921acbf2c am: 49fefde164 am: 444e06c469
am: 0f37e416a4

Change-Id: I4794005c53ae7d99627de25722c846c2a45b856c
tree: 836b840dcef2010a457ba68455e0cf4fdee6ca36
  1. service/