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

Change-Id: Id12235673136f3f3dc4844e9ba84a18afa088b99