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

Change-Id: I07552a5fa16fc66b6379f6b44a97f59e1b712b7a