Merge "b/5063456 Fix event changes checks to be less agressive"