Updated from global requirements

Change-Id: I111b974f1c5f51c341805c35f585c4be2348f845