am b2786939: am c65255f5: am f764730a: Fixes break from ag/530785

* commit 'b27869390b914a53ff972dfc11890be18fc458ca':