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

Change-Id: I794386ae55a3faf0c6bc087dc77405e10244bc48