Updated from global requirements

Change-Id: I86ee9c9502888be9bea0d9c9334d39a2cbb73022