[automerger skipped] Merge changes from topic "dynamic-ref-se-mnc-dev" into oc-dev am: 2d31069fac
am: 53ff808f99  -s ours

Change-Id: Ia9736d803a7b980bafb5b55d76c99a7ee29c68c3