Use American English spelling for behavior

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