synchronization with yota2 branch
Merge branch 'ice-cream-sandwich' into beta-ics