Updated from global requirements

Change-Id: I19c88980d8f12d9725a80e05cbb5418470e6bf37