Updated from global requirements

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