Updated from global requirements

Change-Id: I15d2a43e75d05f446df7e68fa7a6860dceab75ac