Merge "configure port format" into oc-dev am: 5159e13aba
am: 04476645c4

Change-Id: Id61ed47df71dba5a52f525082d9fe0087699b505