Merge "bug fix: fix encoder input port configuration issues" into oc-dev
am: 7d1592a732

Change-Id: I697e916574fc20e1bb9cad79d1e948854078f6bf