Merge "Recovery image is self-contained" am: 397e8f2279
am: 93ea306913

Change-Id: Idf0067a0b9de29a47859bd1fa722830592ba7d0e