am 6ac3b54d: am 8e5d4761: am dfbae1f9: am 15b64099: Merge "Adjust for pipeline stalls" into mnc-dev

* commit '6ac3b54df6151edf25560bce7b9efc388e47f8de':
  Adjust for pipeline stalls