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

* commit 'a39077c95bb51102e77e55a2d4e352f8027d5c24':
  Actually gracefully finish this time around.