Use American English spelling for behavior

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