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

* commit 'c826f92e6f90f4157afd4ed69c6907ff768a0d6b':
  Revert "Do not merge. Return null id for Non-phone device."