Updated from global requirements

Change-Id: I89949916b2805cc7706f5cdae07f0ff17f1f34a3