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

* commit '8e5d47610a31a5d9a62cdd775ef15506cfe29f52':
  Adjust for pipeline stalls