Updated from global requirements

Change-Id: I5e9c61dbf0751c90a191d644e515af5838e96439