Merge "Add missing functions and tests for support library."