Merge "configure port format" into oc-dev am: 5159e13aba
am: 2cb4c9719c

Change-Id: I5880dcb825176bd55be36653f7fb8971afc85a96