Changed from str to message

Change-Id: Iac5059cd6eed7d468824d01c8e0434bb22bf42fc
Merge "Changed from str to message"