am 6d2399c0: am 5c057b32: Merge "Fix unit tests."

* commit '6d2399c003264581218913ef48d47732d6eb0a01':