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

Change-Id: I735d48815f9062064182ade2a69a70a02f98ef55