Merge "bootable/recovery wants EqualsIgnoreCase." am: 89e99f9e0e am: e7c8bb473e am: 4b7ba78fe2
am: 8d47d408fb

Change-Id: Id5a6203edd7d52faae0eed8be244364153fa6956