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

* commit 'cbf285ae0a78f16b0087581eea058faeabd38fd2':