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

Change-Id: I348856e44ba75b37ff12058355f632fb1d928cab