synchronization with cover_sync branch
Merge branch 'master' into ice-cream-sandwich
synchronization with covers_sync branch
Merge branch 'master' into ice-cream-sandwich