Merge "Softflac: enumerate port format" into oc-mr1-dev
am: 7160fe0a07

Change-Id: I77e19465334745d70f191876a6aca44c3b75db1a