Updated from global requirements

Change-Id: I53edc66fe4d112ee6f341aa39943630a74c08a87