Fixed 104 of the 105 errors Im gerring when running the ChangeHandler tests

Bug: 48250

Change-Id: I8a9354dfd1b99ff69ae13327e11d50e19fb8039a
Merge "Fixed 104 of the 105 errors Im gerring when running the ChangeHandler tests"