Updated from global requirements

Change-Id: I5ee5c994a5e1feaadc92c129434292ae1954116b