Merge "init: report shutdown,container for sigterm of init" am: d2b5a2417f
am: 387dbf9ab0

Change-Id: I3978179b92f096e3a951463dbe850a94a77ba27a