Typofix: less bunny hoppers

Change-Id: Ie3c067b369d794f1be73019b8e4a18f84461a17a
Merge "Typofix: less bunny hoppers"