Updated from global requirements

Change-Id: I0804468699cd7af0b3b520c07fd0aeff809bd2b1