Merge "Follow API removal." into lmp-mr1-dev
automerge: d634d39

* commit 'd634d39c605553e669a16fd8fd406aa4695f54af':
  Follow API removal.