Merge commit 'f0fed9dc8784f0635cd27c498beecc45e1f800be' into eclair-mr2-plus-aosp * commit 'f0fed9dc8784f0635cd27c498beecc45e1f800be': Fix for 2202408: Replace Never Timeout with 30 minutes
Merge commit 'f0fed9dc8784f0635cd27c498beecc45e1f800be' into eclair-mr2-plus-aosp * commit 'f0fed9dc8784f0635cd27c498beecc45e1f800be': Fix for 2202408: Replace Never Timeout with 30 minutes