am e1331779: am 95a321fc: Merge "Fix for Never not existing in latest timeout values." into froyo

Merge commit 'e133177980b908d183ed8fe46cf3ea33405b8bd5' into kraken

* commit 'e133177980b908d183ed8fe46cf3ea33405b8bd5':
  Fix for Never not existing in latest timeout values.