Updated from global requirements

Change-Id: I0e89fa48c0ffebbd2a54f516a72f798e784cb307