Updated from global requirements

Change-Id: I39cfdb3a9f792e63ce97b32a7dcf48947ed4d5c3