Merge "Init remove direct calls to light sys nodes." am: 17b959c9ed
am: 9380bfda08

Change-Id: I27f18491fdce054698f0a94493ae049be0b8bbbf