sync options
Merge branch 'master' into ice-cream-sandwich
sync options: fixes
Merge branch 'master' into ice-cream-sandwich