Updated from global requirements

Change-Id: I8b3622b9fafd5e5ea3ec048a18a892d03d2d15fd