Merge "[DO NOT MERGE] Fix build breakage introduced by CL 797896" into mnc-dr-dev
am: b5cef8e440

* commit 'b5cef8e440ee5b054d8b38103aa2d6989c7361ef':
  [DO NOT MERGE] Fix build breakage introduced by CL 797896
tree: ff807cbb728cc7b088af44e5bd1c42d79bf3c1d5
  1. service/