Merge "add null pointer check for msg buffer" am: f03f2a5cd7 am: a3e4876715
am: cf50e34861

Change-Id: I6012632c3690bd67edf3a8b71bde38b232d41d02