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

Change-Id: Ia20c638c46b4a4d8b670c9935ca7c40afd32d044