Use ContextSource::msg instead of wfMessage

Change-Id: I2f55693f4a0bf64f4c4bdb9b512b6a4eef8b013c
Merge "Use ContextSource::msg instead of wfMessage"