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

Change-Id: I38eb28d30124841f0685ceef27aaddf9dbf2c3f6