Updated from global requirements

Change-Id: I9d8c343c49846aefb2368ba47595ec6f3c8c7031