Fixing build and continuing refactor

bug: 11561456
Change-Id: I30d63d6f761d31625c9ec18c200e9d73545db035
10 files changed