am 09228106: am 7219b0a2: am eeaf7142: Fix build/dependency issue.

* commit '092281067c78ed56b95ffeb0cb207e900a203f5f':