Merge "Allow portMode configuration in loaded state only" into oc-mr1-dev
am: ee5201b4d9

Change-Id: I11cb819a277e1a9d83197629f85a4f64c4fa73bc