synchronization with library-service branch
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into library-service
Merge branch 'library-service' into library-service-ics
Merge branch 'ice-cream-sandwich' into library-service-ics