Updated from global requirements

Change-Id: I36360fa24aab4d477fd4b71fbc390574d29adf91