am 0d72a230: am 04bb419c: am ddafcf82: Merge "Fix bugs and add tests"

* commit '0d72a23054341a8e216a33c0191cace1edc0cff9':