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

Change-Id: I1ffd4e68ebcdc444bd673f108ddd205a84dc2885