am c6b32054: am c826f92e: Merge "Revert "Do not merge. Return null id for...
am c6b32054: am c826f92e: Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2
* commit 'c6b32054':
Revert "Do not merge. Return null id for Non-phone device."