Merge "Force re-extraction if dex number is invalid" am: 6944597270 am: 92d835c69a
am: f772220347

Change-Id: I65727a6c04fd182cb7aad673fa789d8ef185a83b