Updated from global requirements

Change-Id: I4cb3e687308ac42608c6f4ee1f2c90671e07c34a