Updated from global requirements

Change-Id: I5c10231456066d6eddafb2c6ca3a4ede0d2d7d66