Updated from global requirements

Change-Id: I93b64953819fb83af78bd34a93c51419da599e90