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

Change-Id: I10ec9af85d5d2808972b4f8ff18a1152037655e9