Use American English spelling for behavior

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