Update overrides and properties

Change-Id: I361d2db84d021731c437a759e99b3f4692166314