Make some messages optional

Followup Ie065c7b5a17bbf1aa484d0ae1f3ee0f5d41f8495

Change-Id: I1f2f648de8c257dcc9a822f19cd32bc7408605ae