Cleaned up error messages for Flavor storage

Closes-Bug: 1379897
Change-Id: Ib80b17f107b05b89a283873aa414621dc12d0eea
Merge "Cleaned up error messages for Flavor storage"