Zero: Switched 515-03 to ip-based unified

Change-Id: I5d3bb7d9867d125bd7964ba824fc7eaa2272dd8b