am 75dc3a9d: DO NOT MERGE; Add back support for uts testing.

Merge commit '75dc3a9d28a184358127390329b36a5a520c212c' into eclair-plus-aosp

* commit '75dc3a9d28a184358127390329b36a5a520c212c':
  DO NOT MERGE; Add back support for uts testing.