Merge "Revert "afm-unit: add autoapi in required-api feature""