Updated from global requirements

Change-Id: I4f196c304eae0d7feb9c9bfbfd39e6a2690e0c9d