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

Change-Id: I4869659f2282cca6fdd3cee0fd4fd92631d54821