Merge changes from topic "dec13_netrevert"
am: 0a4f7921d9

Change-Id: I45543535ee0a394adcb4474ae51a0ce803c01f33
tree: 4d9b16a200dfeebfa997bf4c192eecaeb306520b
  1. core/
  2. services/
  3. tests/