Merge "[DO NOT MERGE] Fix build breakage introduced by CL 797896" into mnc-dr-dev
tree: 75ea4fcfdccc8c377c71bb5e52d5cf15d5a6615a
  1. service/