am 74c7f1fc: Merge "Actually gracefully finish this time around." into mnc-dev

* commit '74c7f1fcd3451bdb5b49f2b44b86fd4ec8eb6794':
  Actually gracefully finish this time around.