Merge "Deprecate AliasActivity" am: 95b815e26e am: 66f56ac1e8
am: 23220f2726

Change-Id: I5f47c62422441997eacc57856ffa1bc43a778660