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

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