Merge "Recovery UI meet issue if image size is too large" am: f5b94d6e9b am: c9b0fe7172 am: 6a6471c858 am: 5e067df975 am: 27baf70568

Change-Id: I73dbe79cc9228a6b0adb342f0c0ccb14f823b8af