update and fix message documentation

Change-Id: Ief59c604788a5cad441e3b847e122fab6bb536e7