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

Change-Id: Icb756316ae631c9a6f0a4e1dbb03d26bda040a53