Updated from global requirements

Change-Id: I01c165c35eb6547c9f7e113aa4a48119862c2b26