Merge "Move message handling logic to local device instead of service."