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

Change-Id: Ia0de3d6b7ee7952ee2a014fbaef2896ff48b610e