Merge "recovery: Don't show "No /cache partition found" on screen." am: 021304503a
am: 7c77883b06

Change-Id: I1797129fa70266d9fe5eb09dece6b00cf75b6f2a