Merge "Fix bot breakages." am: f454679238
am: 062d5bdbde

Change-Id: I2d1f00a250a1c1a274db81815e02101ab350489d