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

Change-Id: Ia10b05040ca5ece675bb6d656602c1e230e600e6