Merge "Changed error message when a storage is full"
am: 1b85a984c8

Change-Id: I343b4440eacdeaad03af934840a814d0c9d7a6ac