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

Change-Id: I0696d49a1324107026ca39aaab24cb7034985a7e