Updated from global requirements

Change-Id: I05802dacfd01f0ad9845dedc6fe3af9c7ca31c27