Updated from global requirements

Change-Id: I41c4c6c40e5f3a214655c96912ca1ffbda5a9418