Fix #667 NPE on sdk < ICS
Merge pull request #1044 from rahulparsani/dev

Fix #667 NPE on sdk < ICS