Merge "init: log control messages along with the process that sent them" am: 0f8a67d6a8 am: 76583e1637
am: 7ad6bed77b

Change-Id: I9722417898ea78f28901da7877dfe37f467300d3