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