Code cleanup from rebase

Bug: 195423591
Change-Id: I623d6ef46458a282e3c63cde0bdc457cb38e4d50
4 files changed