Updated from global requirements

Change-Id: I1d0ec675677b3c48715da78f1f491a6db24cfa23