am bb928ef3: am fa912941: Workaround NPE on Android 2.1

* commit 'bb928ef31734dbf3b1bb6cdf71d5a4d9133bca74':
  Workaround NPE on Android 2.1