am 24421e07: am 14ddbda6: am a38a15dd: Merge "tiny refactor"

* commit '24421e07f5f0fe0d7b399eb3b642249b149e78e6':