Merge "Empty toast should not be displayed"
am: 129fde5a57

Change-Id: I995d82ffea60259face03c3daf04a219e44d7557