am 665f5465: am 4bc1a0ce: Merge "Add missing functions and tests for support library."

* commit '665f54659d60d7e85378fc181acfe520dc515a30':
  Add missing functions and tests for support library.