Updated from global requirements

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