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

* commit '51942bedde56abe862f4d13af9ee27b916175d23':
  Prevent future instances of the last bug.