Merge "Remove don't bother checks" am: 6c555c1779
am: 80f54ea701

Change-Id: I549e0ebc6b07f1500bc9f813a42205a62a75d348