Update message layout am: 1787517df1 am: c7a8eb5b5b

Change-Id: I8fc26435d372ccaf4c912f1fcf297af699800269