Merge changes from topic "dynamic-ref-se-mnc-dev" into oc-dev
am: 2d31069fac

Change-Id: I282ef1b63da084bb0906bee79ec5a7b0e9e66a2c