Merge "Revert "Remove don't bother checks"" am: 57207cd8a6 am: 8444d05a47
am: 905d0aec87

Change-Id: I0a24ee37d2a85c58da01dfb1d1f30886b1154b4d