Merge commit '95a321fc' into froyo-plus-aosp * commit '95a321fc': Fix for Never not existing in latest timeout values.