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

Change-Id: I5926dab52f71b9d792fe6227c49a8244200a4ec0