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

* commit '54342710ac9cc2fd594c1d52cdc84c80485bc093':
  Speculative bug fixes