Fix up ip reporting for havana

Change-Id: Ia1f3263aa84d21f1853fe56b84ec91c5d9a4a734
Merge "Fix up ip reporting for havana" into production