Updated from global requirements

Change-Id: If3e57fa8534abc39228b3251b78ecbf15d697fb8