Merge "Refresh some of our error prone rules" am: 1f27bcfac3
am: fd43bfc6bf

Change-Id: I51692e7f162455c2c4db137e1d48a24bef635938