Merge "Seems we have error conditions where fa_storage_key == ''"