Updated from global requirements

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