Hygiene: Fix rubocop warnings

Change-Id: Idd59bdd66016b3cc10d39c363cd74e27b1f89a5b
Merge "Hygiene: Fix rubocop warnings"