Some legacy changes

Change-Id: Ic32de384975ec081cf08a7e55976b7f2c9e099f7