Use American English spelling for behavior

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