am 25f39b2f: am 62cd88d0: Merge "FDO: Only support locally"

* commit '25f39b2fbe9dee8ec6c680569c22c71fce9e595c':
  FDO: Only support locally