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

Change-Id: I55f7da2e88b539e9c8c8367e12bfa8cf10f95b19