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

Change-Id: I82164b85e4ad3d2a3f363c14526fb3645ec47397