Updated from global requirements

Change-Id: I538a7f66ff752e4850db3c97734462c0c556d5b8