Remove AU State label and newline email

Change-Id: I7d3b0f5c4d61d889a889bff263784046dd5b0962