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

Change-Id: I252769a5cd81a0421f78da62c3af6cbe6599fecc