Updated from global requirements

Change-Id: Ia37ad63d6b501334be59bad2db31ebff0157151c