Updated from global requirements

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