Updated from global requirements

Change-Id: If98293e9277dc99c596a2a8e9c9584b58f8bc6fc