am cc60b7dc: am baee9ed5: am 7a73344b: Minimal fix for stuck google now.

* commit 'cc60b7dc3c2f1cbb8dc9917ec368e8d89cb050e7':
  Minimal fix for stuck google now.