Typofix and block another bot

Change-Id: I63e1f11c694ac5d3995e20126064096a5f9b618e
Merge "Typofix and block another bot" into production