Use American English spelling for behavior

Change-Id: Iae025b1ad15b42ff83fabd0568721650e9f09fdf
Merge "Use American English spelling for behavior"