Updated from global requirements

Change-Id: I7981b723cee97ee65a7d58d5b058f24aa734c0e2