Updated from global requirements

Change-Id: I218171b2e3581ea05a14719a821c131dd47c8eb5