Merge "Fix account build warning"