15 min => 30 min
Merge branch 'master' into ice-cream-sandwich