Updated from global requirements

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