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

Change-Id: Icc7661bca07e16f0b230b35ab7f1df8f0d8a8189