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

Change-Id: Ia1f57e6f9ccbad2b6d2ce675c7b75eab39a972ea