Updated from global requirements

Change-Id: I38e845f28f0f897b9d112dd9bd95e8249621bc67