Remove unused mw reference in RepoApi, expand alias

Change-Id: I2358da92546829d42435577ca792fedd089bea0d
Merge "Remove unused mw reference in RepoApi, expand alias"