Some Cleanup

Bug: 26395083
Bug: 26348883
Change-Id: I1e9b92fda1c83420ad72764ce2f02d7f40b34dae
3 files changed