Updated from global requirements

Change-Id: Ic7f94f4b0d58b9a51c226b409f0ce53c35d7a764