am 21c04fe3: Merge "Further harden getListOrNull" into froyo

Merge commit '21c04fe31c978fc68c473a5bef5c93b20363fe8e' into froyo-plus-aosp

* commit '21c04fe31c978fc68c473a5bef5c93b20363fe8e':
  Further harden getListOrNull