am b2044da3: Do not merge: cherry-pick a fix for a npe.

Merge commit 'b2044da3f9f9ad74f0dffd5ae024e558f8a9a89a' into gingerbread-plus-aosp

* commit 'b2044da3f9f9ad74f0dffd5ae024e558f8a9a89a':
  Do not merge: cherry-pick a fix for a npe.