Updated from global requirements

Change-Id: Ib6f25a7e39c94b1964541e9792306e272ab74c94