Updated from global requirements

Change-Id: I92903d6cc83df1127bd9fbd5db77441def43f9dd
Merge "Updated from global requirements"