Updated from global requirements

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