Updated from global requirements

Change-Id: I6b4b5cfafb12f51e2ab180d28077d9b5b778c389