Updated from global requirements

Change-Id: I0106228c8d5dcd3a52fae3e07c59021dd759df5e