Updated from global requirements

Change-Id: I8e7a4a2b9d84c11335e83b17bc8bdab5d051bfea