Updated from global requirements

Change-Id: I8e4a88805eb0102fed92c578c15afd12221e909e