Clear aliases when setting all aliases

Tests to come in a followup

Change-Id: I668d8eccb40ef7f384d03657fe4f5a1da4f017fc
Merge "Clear aliases when setting all aliases"