Updated from global requirements

Change-Id: I7efddfb5b5cc2219877b28a5e4e3104f6f7f523c