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

Change-Id: I6e89b82b744c443ca4419fc2b8f5e1454f1ff6bb