Add message for toast to the module that uses it

Change-Id: I0150d0ea1fa452cef404efb55c4162d61001e8cb
Merge "Add message for toast to the module that uses it"