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

Change-Id: I4c528e96683852d647824872aa4ba80c70e2a315