Two reported by users, the other spotted by inspection. Bug: http://code.google.com/p/android/issues/detail?id=16002 Bug: http://code.google.com/p/android/issues/detail?id=22225 Change-Id: I86fe022fda4af68e5a6fb9dc5dd2abdb75e9d966 This was committed to master, cherry-picking to jb-mr1-dev