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

Change-Id: Ie6b167162db57ab83b82c27000373ecebda17334