Merge "Revert "Remove don't bother checks""
am: 57207cd8a6

Change-Id: I2224aa6b378ef396801079874bf51aeba3151e60