Updated from global requirements

Change-Id: Iffb6e9e504a51f6cbdbee4316bf15ac3666be310