Use American English spelling for behavior

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