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