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

Change-Id: I0bcc4914246bac2fe28808bc8a4873550dadbb80