Updated from global requirements

Change-Id: I69395a7c202bd52445a86ba49c79451f83b6d256