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

Change-Id: Iece00108c7da68848f63696c5803e759b37bd4a0