Merge "Deal correctly with short strings am: 1921acbf2c am: 49fefde164 am: 444e06c469 am: 0f37e416a4 am: 04fdb2ce41 am: 05e029710c am: 8e0899faab am: 15a72380b1 am: a9c9a971cf am: 6ff9395a12" into nyc-mr1-dev-plus-aosp
tree: 1356a5917cc12279e2b60d545bee7ae857c9089d
  1. service/
  2. tests/