Updated from global requirements

Change-Id: I84fe28d2e68378d89479d45aa98c17e50f7f687b