Merge "Use public API permission, not the internal permission" into lmp-mr1-dev