Merge "Revert "Start using new list of non-SDK APIs""