Merge "DO NOT MERGE Check "hardware_id" Property" into froyo