Updated from global requirements

Change-Id: I222d1e8d6d508196bc5d95ce406e876a0fd5d447