am 418633fa: am cbf285ae: am 8c70b471: am a6125efb: Fix build break

* commit '418633fac5cc29a05f70133969320f9569c3a610':