Updated from global requirements

Change-Id: Ia126b95d6673ad73ad9f377c638a022e2b485799