Updated from global requirements

Change-Id: Ief98053291a94b8666a6e83ac6f941aa9eafa8d8