Merge "Fix cases where we miss instrumentation changes"
am: 1b876790ec

* commit '1b876790ec3e9801ef40fa26630ca925f319956c':
  Fix cases where we miss instrumentation changes