audit rewire

Change-Id: I000bbafe2448cec236b7524881beb827cad48a54