Merge changes from topic "dec13_netrevert" am: 1aab035706 am: 6da484b455 am: 23799f4e4b

Change-Id: I266bc6772d5cd2068caa35ecc98b077da2c5255f