Merge "recovery: fix non-MTD mounting (uninitialized variables)" into ics