Re-implement navring targets [2/2]

Change-Id: Icda1176b0275abe5ab6613be053cafde9a25d663