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

Change-Id: Ia3ede7d43fa19237cff255135c3c3e3b71b8b585