Merge "Fix bot breakages."
am: f454679238

Change-Id: Id0d3134cf984fa7d76e2a52673921792a76a0a56