Updated from global requirements

Change-Id: I6a6a70d8a7c899c476ff6cce5dd1bbf912d1b32d