Updated from global requirements

Change-Id: If0f72cd9eb7bb03c7d981986ca78490ad63082f0