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

* commit '4bc1a0ce2124624045f5b19d027175d3598670fa':
  Add missing functions and tests for support library.