Merge "Revert "Revert "Remove don't bother checks""" am: f040585a6b
am: 805eec1f1e

Change-Id: I29e00fd8e69b84e675040328ecaad5903f483028