Re-implement navring targets [1/2]

Change-Id: I2232ab3a207b8368bd3daeb5df35c998d4a510e3