Updated from global requirements

Change-Id: I9dac7eefa4dc427f509219671be990a7c946c44a