Updated from global requirements

Change-Id: I7b6141b9d0cfea247ec5642b37dc1a45f3abfbb0