am e2710c13: am ad3f1b7e: Merge "Speculative bug fixes" into ub-gmail-ur14-dev

* commit 'e2710c13fc275ccdebb0921ec84e12bebe594801':
  Speculative bug fixes