Updated from global requirements

Change-Id: Iaff24625b02d44b52291731af5e4ebefb51d65cc