Updated from global requirements

Change-Id: I215a53a00948b6477ba9d493df8b0ea6ef6e6d83