Use American English spelling for behavior

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