Merge "More API lint checks." into lmp-dev