Updated from global requirements

Change-Id: I00a207434234ef303c577bf790ec8ac7898b9f2b