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

Change-Id: I9f6e7079d8e5d2e978ba618800c98df6e19e022b