Merge "Don't set the failure extra on split install" into oc-dev
am: d14e67656f

Change-Id: I8c317e316b699d742db50b2b642f2d1b0304de57