Updated from global requirements

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