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

Change-Id: I616433249e6cedde2455f5e0a6c3f2327618da42