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

Change-Id: Id60a6e1ecac59f5ed875e0b7ff5f5c289e7e617e