Merge "Fix input cdex -> output non-cdex" am: b7a3ddfaa3
am: acbc12e70b

Change-Id: I551d713831757ba33d215068eba8e4955e5ccd87