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

* commit '14ddbda63dc5bf7b2332014f6a0dfa0ddd84b331':