Updated from global requirements

Change-Id: Ib6937e17e128fd7f74c6e04ea80eb06231c1c24d