Merge changes from topic "dec13_netrevert" am: 0a4f7921d9 am: 7e3ef8f227 am: cc268504d4

Change-Id: I266bc6772d5cd2068caa35ecc98b077da2c5255f
tree: 66a6d5cbab21fabdd1938881cc902be6746de31f
  1. core/
  2. services/
  3. tests/