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

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