Merge "Change attribute values per API council." into mnc-dev