[squash] missed that pesky Android commit