Updated from global requirements

Change-Id: I4758cb3c316356299595ca895e13cfcfc0b88123