Updated from global requirements

Change-Id: I5e24bb4ca77b541d9060d262ca3e6865991a3751