Merge "Fix attribute parsing of PreferenceHeader_id"