Merge "init: add error handling in control message"
am: 9252d31361

Change-Id: I1915a3e1f97c582200b377797a5baa1d9d308592