Updated from global requirements

Change-Id: I85e5f9e8b4cea3895231fd0c8a6e99e0ca59b204