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

Change-Id: Ie11a3b59ebd6e85861db576dc5ae70d641a05b75