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

Change-Id: I9f77a567605f365b23f8acc82023ed3fc7a44107