Merge "Follow API removal." into lmp-mr1-dev