Updated from global requirements

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