Updated from global requirements

Change-Id: I0927c32bf0be4afd0073ede58c8b0ddfb704153f