Updated from global requirements

Change-Id: Ia8e3281f6aa373a60b99036b9cd25ade58793e87