Updated from global requirements

Change-Id: I800b86b2ce700752422a80ccf53d2bc6c63095ea