Merge "Revert some new APIs for restrictions provider" into lmp-dev