Updated from global requirements

Change-Id: I38909f327f5d168fca2f53a8e32eb39db5d98ee9