Updated from global requirements

Change-Id: If6dbe9c45926d0ecc62f858f7d466896ac1872a4