Updated from global requirements

Change-Id: I18a14ca014e764c3d76bd6df76216938f8cc5b05