am 15b64099: Merge "Adjust for pipeline stalls" into mnc-dev

* commit '15b64099a440a5f6256f4c51c6d9ae13a754f94d':
  Adjust for pipeline stalls