Updated from global requirements

Change-Id: I4eabc5e31337a7411531b8282ed2001800aaabdf