Fixes in lightbuld with navring

Change-Id: I3741d2bf43dd089afa762070a093938bf4178ee9