Merge "Prevent future instances of the last bug."
am: 113206fb65

* commit '113206fb6548cf95bdb91821c7b4dd384c926756':
  Prevent future instances of the last bug.