Updated from global requirements

Change-Id: I24045c93efa7c324be4aa3e6f9014751a95a2edc