Merge "Add missing calls to `RecordSimplification()`." am: 1d5287ccb5
am: daf7ea98e0

* commit 'daf7ea98e00a866d6251e06efb218e8665eda9fa':
  Add missing calls to `RecordSimplification()`.

Change-Id: Iaf8aa32ee317c6c4721bf49808650476235ec276