Implement Legacy and base configuration am: ff9cbf7c6c
am: cc848940c5

Change-Id: I1ad8219deb122d1059dc9c148d4aa8ed6fd26977