Merge "Add api 20 to list used by reference docs." into klp-modular-dev