Updated from global requirements

Change-Id: I33ad0d48100f2b0e995e7c80f388449fcd5ea86e