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

Change-Id: I930ebd411bc755125064f897ee01181a1346ce2e