picks up some lint, build fixes Change-Id: I0efb19385afa4ea3073a53e2b8334e57f245eea0
Change-Id: I38dad398844ee424a7a92a745ab703645018d02b