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

Change-Id: Idefb3b705fcf200e2671caee9b71900827baebbd