am 1017fb21: am 8099342d: am be4d38e6: Merge "Fix test breakage"

* commit '1017fb215777ff905023bfdc70446556c51ecd1d':