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

Change-Id: Ie51835289fb0aa98624168d5bda32a59b7c2d497