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

* commit '8420d3e8a7a8bc240b6143e29f67f74a4c0b1e7e':
  Speculative bug fixes