Merge "Fix adp_car build breakage" into nyc-dev
am: 0582e2a  -s ours

* commit '0582e2a4cf8f7b0a7d6b9d31988775a0dfac7cf1':
  Fix adp_car build breakage

Change-Id: Id51c1ef444ddaa681072441e8768e3aab8612f56