Merge "Fix unquickening logic for quickened input dexes" am: 037194d280 am: 8388a16f2c
am: d684ba7b69

Change-Id: I250bac133ae5833091156472c13ed1b1d8ef80d1