fixed possible NPE
Merge branch 'master' into ice-cream-sandwich
updated ChangeLog
Merge branch 'master' into ice-cream-sandwich