Merge "Delete OverrideLog and cleanup includes (1/2)"
am: 661a140164

Change-Id: I166a2081edb9f8198779223bfa5eedc7bf155d88