Merge "bootable/recovery wants EqualsIgnoreCase."