Updated from global requirements

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