am 3b8d7ede: am ac01f5ca: am 997d2ec5: am 8afebe18: am f74c07e5: am db07b716: am a4c44654: Merge "Move a couple classes to the utils package"
* commit '3b8d7ede04996644095c287cc3c5afacadbffd44':main
commit
7432810b85
* commit '3b8d7ede04996644095c287cc3c5afacadbffd44':main