Merge "Fix GO Phones..added attribute to this device profile that other phones already had" into tm-dev