Fix for nav ring stuff.

Change-Id: Ied1d292dd7c0eafcce4416357a9171a1843c1f1c