Do not store empty aliases in the datamodel

Bug: 51811
Change-Id: I9d88489da21da12c6e2ae191ea065376daae6253