Add message for android and to core
Merge