Updated from global requirements

Change-Id: I3c68bc324074af3ef54056d4dff9d9d4f715d2b8