Updated from global requirements

Change-Id: If18f264561eb84f0a0695c41b53c7b539cee6f35