Updated from global requirements

Change-Id: Ia54da66d13b2667375a8a85c97ced25fd97b6b25