Updated from global requirements

Change-Id: Ib04a23e6ca0c2f6bfebd726fbe5a4d471cb93c33