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

Change-Id: I7205637574c06b010c23251fc271165d8e386a6a