Updated from global requirements

Change-Id: I9641aab3de827e160e6fca556b47f6b8b14e681d