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

Change-Id: I9f6e7079d8e5d2e978ba618800c98df6e19e022b