Merge "init: -1 log for control message error paths."