Merge "Tiny tiny style fix" am: 6d262af067 am: f05daf0388
am: 7d687a4e7d

Change-Id: I8efd2f55388d6a1f917814064b10429c1752b298
tree: 6f7535355e01dcfb1a05d5e5dbf7476285ab60c7
  1. service-t/
  2. tests/