Add shims for network info classes am: 8282d3c8f1 am: 4b8f48e635

Change-Id: I3e7dd7acc1f10167c385a1f085b469470f4a49ee