Updated from global requirements

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