Merge changes from topic "dec13_netrevert"
am: 1aab035706

Change-Id: I45543535ee0a394adcb4474ae51a0ce803c01f33