Updated from global requirements

Change-Id: I118827c72e16c1cb3a543c4451d0606930f0753d