misc fixes
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota2