forgot to adopt messages for sunos and win users

Change-Id: I9cb6e6734257803d551c830f0a5357776223ec9a