net: bulk update from tuna

Change-Id: I9bed3e25f5d4bd12b9e283239441532469a1a65f