Updated from global requirements

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