optimization
Merge branch 'master' into ice-cream-sandwich
extracted InputStreamHolder interface
Merge branch 'master' into ice-cream-sandwich