Merge "Instrument wifi-service when EMMA_INSTRUMENT_FRAMEWORK is true." into nyc-mr1-dev
tree: 4d2a68fa47481714a500e5a738dbfa1edbcb43c6
  1. service/