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

* commit '5ffd76c6a0883658b38aea8862d2444f46a9878a':
  Add missing functions and tests for support library.