synchronization with nook branch
Merge branch 'master' into ice-cream-sandwich
synchronization with nook branch
Merge branch 'master' into ice-cream-sandwich