Updated from global requirements

Change-Id: I7c67a203a375fc18d8c8d5c3bc3a416fab8d0da8