Merge "light service: mark as shutdown critical" into pi-dev
am: dca679a7a9

Change-Id: Icc48ad7c4c5e89489e38d3b005435ed666f3332d